Merge git://git.denx.de/u-boot-fdt
authorTom Rini <[email protected]>
Fri, 22 Jan 2016 22:01:22 +0000 (17:01 -0500)
committerTom Rini <[email protected]>
Fri, 22 Jan 2016 22:01:22 +0000 (17:01 -0500)

Trivial merge